d/gbp.conf: configure to merge upstream tags into upstream/latest (add https://github...

diff --git a/debian/changelog b/debian/changelog
index 1700f6bf503c6748315c726d4a3ba73990dcd48f..79442deac04083ef0e46cf8fe8628979b17d958b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ostree (2016.5-5) UNRELEASED; urgency=medium
     upstream to make ostree buildable on Debian jessie
   * d/watch: fetch releases from GitHub instead of GNOME
   * d/gbp.conf: configure to use upstream/latest for upstream imports
+  * d/gbp.conf: configure to merge upstream tags into upstream/latest
+    (add https://github.com/ostreedev/ostree as a remote)
 
  -- Simon McVittie <smcv@debian.org>  Wed, 15 Jun 2016 14:05:53 -0400
 

diff --git a/debian/gbp.conf b/debian/gbp.conf
index b444f8e2e7b308ae9a2cd13f0049d1918bdbaf79..2bda9c8b6ce83248eccd88c38c71fffb4f3df66b 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,4 @@ compression = xz
 debian-branch = debian/master
 upstream-branch = upstream/latest
 patch-numbers = False
+upstream-vcs-tag = v%(version)s